merge.
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sun, 14 Aug 2005 17:33:32 +0000 (17:33 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Sun, 14 Aug 2005 17:33:32 +0000 (17:33 +0000)
1  2 
xen/arch/x86/mm.c

Simple merge